projects
/
ostree.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0ac0b22
)
Revert "ostbuild: Check for the Makefile in the correct directory"
author
Colin Walters
<walters@verbum.org>
Mon, 16 Jan 2012 14:39:13 +0000
(09:39 -0500)
committer
Colin Walters
<walters@verbum.org>
Mon, 16 Jan 2012 14:39:13 +0000
(09:39 -0500)
I'm not sure how this made anything work...probably I was screwing
something else up.
This reverts commit
aeeed8da13086baefcff4b2e5c6a62727226ad4d
.
src/ostbuild/pyostbuild/builtin_compile_one.py
patch
|
blob
|
history
diff --git
a/src/ostbuild/pyostbuild/builtin_compile_one.py
b/src/ostbuild/pyostbuild/builtin_compile_one.py
index b18f00d9aad7fdac619bd4f4338b9edf76338c10..08d3614f922cbcbc6d63b8075e6046515be6cc58 100755
(executable)
--- a/
src/ostbuild/pyostbuild/builtin_compile_one.py
+++ b/
src/ostbuild/pyostbuild/builtin_compile_one.py
@@
-152,10
+152,7
@@
class OstbuildCompileOne(builtins.Builtin):
args.extend(self.configargs)
run_sync(args, cwd=builddir)
- if use_builddir:
- makefile_path = os.path.join(builddir, 'Makefile')
- else:
- makefile_path = 'Makefile'
+ makefile_path = os.path.join(builddir, 'Makefile')
if not os.path.exists(makefile_path):
fatal("No Makefile found")